Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs23/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:34 +0000 (20:14 -0500)
committerRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:34 +0000 (20:14 -0500)
commite13371d117f5f8480c069a2221889f3e65e0664e
tree3ab3ec536157e7f666b314db498c121a9481fe88
parent30466b0d7174982939e9231e0cd056aa448ca193
parentd2e84c95f1d5cea598088edbda7de2a00b748d64
Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs23/d/sid/upstream